Merge branch 'master' of git://git.denx.de/u-boot-atmel
authorTom Rini <[email protected]>
Mon, 30 Nov 2015 23:13:10 +0000 (18:13 -0500)
committerTom Rini <[email protected]>
Mon, 30 Nov 2015 23:13:10 +0000 (18:13 -0500)

Trivial merge